Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 14 Jul 2010 13:03:03 +0000 (13:03 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 14 Jul 2010 13:03:03 +0000 (13:03 +0000)
commit7a4582eac40719d82af156521e3999af409f3733
treee13a2f7bad710efb72a99d5208903a59adb25117
parent09c1eeffe2c59d91169575b1ddafd982c7e19b35
parent2ad0747ab17e90463319893ab8ec234ddae3c6fd
Merge from mainline.